Fix TAP syntax in test-basic-user.sh, and run it

In its initial commit, Alexander Larsson wrote

    This works standalone, but unfortunately it breaks in
    gnome-desktop-testing-runner as /tmp doesn't support
    xattrs, so it is not installed atm.

but we now (a) use /var/tmp, and (b) explicitly skip the test if
xattr support is unavailable. So it should be OK to run now.

Closes: #652
Approved by: cgwalters

diff --git a/Makefile-tests.am b/Makefile-tests.am
index 63ceea1eb15c311b845e7886ff94403bae59a40d..f37c59daee49362ec184e84f5cf5a850f33ebbe6 100644 (file)
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -45,6 +45,7 @@ dist_uninstalled_test_scripts = tests/test-symbols.sh
 
 dist_test_scripts = \
        tests/test-basic.sh \
+       tests/test-basic-user.sh \
        tests/test-pull-subpath.sh \
        tests/test-archivez.sh \
        tests/test-remote-add.sh \
@@ -119,7 +120,6 @@ dist_installed_test_data = tests/archive-test.sh \
        tests/pull-test.sh \
        tests/admin-test.sh \
        tests/basic-test.sh \
-       tests/test-basic-user.sh \
        tests/corrupt-repo-ref.js \
        tests/pre-endian-deltas-repo-big.tar.xz \
        tests/pre-endian-deltas-repo-little.tar.xz \

diff --git a/tests/test-basic-user.sh b/tests/test-basic-user.sh
index 42e6a8648e4cd8655375de7f1258f16a7e284d96..3e11545e382ba83c8896c305e2049ba286faccd3 100755 (executable)
--- a/tests/test-basic-user.sh
+++ b/tests/test-basic-user.sh
@@ -23,9 +23,6 @@ set -euo pipefail
 
 skip_without_user_xattrs
 
-echo "1..1"
-
 setup_test_repository "bare-user"
-echo "ok setup"
 
 . $(dirname $0)/basic-test.sh